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

This reverts commit 6718413dd88fbee5928228737977c747bf878743.
feature_f
Merge branch 'feature_f' into development