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

This reverts commit e82e7ff9836af2ebc2db002b8f25c6bcae2f975e.
Fix file11.txt in app2.
Merge branch 'feature_f' into development