#10591 changes from Customer