Merged changes from main branch up to release 2.2.1