Merge "add back empty whitelist"