Merge "Updated whitelist and a fix for target x86_64"