Ticket #844 (new task)