Merge branch 'master' into revert-paxexam-639.
Effectively reverts to d49e06b1a824715abab6d64b1682103140ac4219