Extended editation of unit
Merge origin/master