Ticket #841 (new task)