Merge branch 'release/3.0.1.2' into develop
Migrated to 3.2 #5520
Merge pull request #3 from aroraumang/feature/task-5520

Migrated to 3.2 #5520
Merge branch 'release/3.2.0.1'