Migrated to 2.8 #2347

Task ID: project-989/task-2347
Review ID: 395001
Merge branch 'feature/task-2347'