#10596 changes