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