Merge "Mirror pending temp whitelist from AMS to ATMS (30/n)"