Merge "Fix allowlist token issues" into udc-qpr-dev