Merge: rev793 (Ensure that for trusted, auto-authorize RPs, AX data is still returned.)