Merge branch 'mg/killed-merge' into maint