#10591 changes