Merge branch 'release/2.6.0.2' into develop
Migrated to 2.8 #2345

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

Migrated to 2.8 #2345
Migration to 3.0 #3134
Merge pull request #14 from priyankarani/feature/migration

Migration to 3.0 #3134
Merge branch 'release/3.0.1.0'