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