gont/web: minor changes towards release
Merge branch 'develop'

* develop:
  gont/web: minor changes towards release