Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'