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