Hide organizaton setting option in the menu
Merge branch 'MH-543' into dev