Resolve "Missing unit in menus"

Merged Lauri Himanen requested to merge 1245-missing-unit-in-menus into develop

Merge request reports