Merge branch 'chore/standardize-mrf-behavior' into 'develop'