Merge "Remove unnecessary pending temp allow list in ATM" into tm-dev