Ticket #1353 (new task)