Merge branch 'hotfix/6.1.4'

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

* hotfix/6.1.5:
  * Updated gems