Merge branch 'tests/mrf_policy' into 'develop'