Changes to scrub page, not sure if going to keep
Fixing re converting unicode to ascii string
Merge branch 'master' into scrub-dev
Merge branch 'master' into scrub-dev