Ticket #36141 (new task)