Added support for whitelisting domains used in URLs
Synced from master
Synced from master