Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'