Ticket #413 (new task)