Merge branch 'hotfix/0.18.6'

* hotfix/0.18.6:
  * Updated gems * Fixed alerts
* Updated gems
Merge branch 'hotfix/0.18.7' into develop

* hotfix/0.18.7:
  * Updated gems