Merge "Replace deprecated whitelist_externals"