Formation implementation
Formation implementation
Merge branch 'formation' into develop