#10591 changes from customer