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