Adding Unit Manager
Resolve problem with priorities
Merge branch 'feature/FX-2' into develop