issue #19131: Various fixes for customer.