Merge branch 're-mrf' into 'develop'