unbreak menubar
Merge branch 'next' into contract-migration