Merge "Add a new permission check around unique id attestation"