Ticket #830 (new task)