separated to branches
Merge branch 'ftr_brnch'