Ticket #265 (new task)