feature 1 implementation
Merge branch 'feature_f1' into develop