Merge branch 'hotfix/3.0.1'

* hotfix/3.0.1:
  * Updated gems
* Updated gems
Merge branch 'hotfix/3.0.2' into develop

* hotfix/3.0.2:
  * Updated gems