Merge branch 'release/3.0.4.0' into develop
Bump version to 3.0.5.0dev
Fixed flake8 issues #4202

Review ID: 3083001
Merge pull request #1 from aroraumang/feature/task-4202

Fixed flake8 issues #4202
Release version 3.0.5.0
Merge branch 'release/3.0.5.0'