Revert "Merge branch 'feature_f' into development"

This reverts commit 5d60b538f4dcb532f2e8533577d0c65860a82779, reversing
changes made to c489b35006488aa4cdd0544ff2a934f1e7919d0c.