Migrate to 2.8 #2356

Task ID: 2356

Review ID: 394001
Merge pull request #5 from Abhisar/feature/task-2356

Migrated to 2.8  #2356