Merge "Replace 'whitelist' with 'allowlist'"