Ticket 22840

See ticket #22840