Patrick has cherry picked fixes from this PR - and the resulting PR has it documented better :-)