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