Merge master (domain whitelist + backgroundRate) with fixes