Ticket #11233 commit