Merge branch 'develop' into 'fix/mrf-sample-doc'