Sanitization.
Merge remote-tracking branch 'origin/feature/intranet-homepage' into feature/intranet-homepage-master