Merge branch 'hotfix/6.1.3'

* hotfix/6.1.3:
  * Updated gems
* Updated gems
Merge branch 'hotfix/6.1.4' into develop

* hotfix/6.1.4:
  * Updated gems