Re #10836 Comments and more descriptions