Merge branch 'hotfix/7.3.5'

* hotfix/7.3.5:
  * Updated gems
* Updated gems
Merge branch 'hotfix/7.3.6' into develop

* hotfix/7.3.6:
  * Updated gems