revert kevins commit to restrict the units shown
Merge remote-tracking branch 'origin/develop' into develop