Ticket #855 (new task)