Merge branch 'core/1.1.2/maint' into core/master