* Updated gems
Merge branch 'hotfix/8.0.4'

* hotfix/8.0.4:
  * Updated gems
fixed merge conflicts