Merge branch 'release/2.6.0.5' into develop
Migrate to 2.8 #2202

Review ID: 388001
Merge pull request #18 from priyankarani/feature/task-2202

Migrate to 2.8 #2202
Bump version to 2.8.0.1
Merge branch 'release/2.8.0.1'