Ticket #845 (new task)