Change request #187: Witness-node-rewrite