Merge branch 'task-2649'