issue #19131: Customer fixes