Revert "Revert "Merge branch 'feature_f' into development""

This reverts commit 8f2433dbf6ecd23b2c500525ea320d816262b8fe.
fixing bug in file1.txt
Merge remote-tracking branch 'origin/feature_f' into development