Ticket #1407 (new task)