Revert "Revert "Merge remote-tracking branch 'origin/feature_f' into development""

This reverts commit 2fb910ca13b64d211458485c2fe3218d77d176ea.
fixing bug in feature_f
Merge remote-tracking branch 'origin/feature_f' into development
Merge remote-tracking branch 'world/development' into development

Conflicts:
	app1/file1.txt