Ticket #36164 (new task)