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

This reverts commit 7434ccb4ca8e58898ba868bb7c6b094b778019ef.
fixes for feature_f pulled out of release branch which is merged to master
Merge branch 'development' into feature_f
Merge branch 'feature_f' into development