Merge branch 'hotfix/0.18.7'

* hotfix/0.18.7:
  * Updated gems
fixed changelog
[ci skip]
* Updated gems
fixed merge conflicts