* Fixes for PR 18015, from customer.