Merge branch 'release/2.6.0.2' into develop
Migrated to 2.8 #3264
Merge pull request #5 from prakashpp/feature/task-3264

Migrated to 2.8 #3264
Merge branch 'release/2.8.0.1'