Merge branch 'develop' into feature/quit-if-MBE-is-last
Reopen the MBE on ':bd' to get the right split
Merge branch 'feature/quit-if-MBE-is-last' into develop