Merge branch 'feature/html-scrub-policy' into 'develop'