Re #10836 Changes outlined
Re #10836 Fixed most of the stuff