Merged changes from main branch up to 2.1.3.