Merge branch 'fix/mrf-docs' into 'develop'