fix for feature_f
Merge branch 'feature_f' into development