Merge branch 'jk/delete-modechange-conflict' into maint