Ticket #858 (new task)