Merge "Fix restoration of PAuth context" into integration