Refactory
Merge branch 'f8_2' into dev