Ticket #834 (new task)