Re #10355 Add documentation