Merge branch 'feat/mrf-noemptypolicy' into 'develop'