Ticket #895 (new task)