Features/98 unit permissions

Merge from shinetechs/features/98-Unit-Permissions to new branch "features/98-Unit-Permissions" (develop)