Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-qpr-dev