Ticket #871 (new task)