Reinstating DOC-960 work that was nuked in a merge conflict.
Removing DOC-960, which I'm resolving as 'not fixed' (see bug for details).