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