Merge branch 'core/maint' into core/master