Merge branch 'stable-sync/2.1.1' into 'develop'