Fix test errors and resume org menu
Merge branch 'MH-780' into dev