Merge branch 'fix/mrf-tag-typo' into 'develop'