Merge "NFC: always upper-case parsed AIDs." into klp-dev