Branch: tasks/BUG-4061#54fd685