Merge "Reject invalid AIDs." into klp-dev