Merge branch 'release-0.37.0' into develop

* release-0.37.0:
  Bumping version to 0.37.0
Fix ec2 namespace issue
Bumping version to 0.38.0
Merge branch 'release-0.38.0'

* release-0.38.0:
  Bumping version to 0.38.0
  Fix ec2 namespace issue