Merge branch 'jk/delete-modechange-conflict'