Merge pull request #6562 from KarlVogel/host_sanitize