Ticket #851 (new task)