Ticket #865 (new task)