Migrated to 2.8 #2345

Review ID: 472003
Merge pull request #13 from prakashpp/feature/task-2345

Migrated to 2.8 #2345