Formation counter fixed
Merge branch 'development' into integration