Merge tag '0.8.5' into develop

Add error page

* tag '0.8.5':
fix errors page
Merge branch 'release/0.8.5.1'

* release/0.8.5.1:
  fix errors page