Merge tag '0.8.5.1' into develop

Fix error page

* tag '0.8.5.1':
repalce match to get
Merge branch 'release/0.8.5.2'

* release/0.8.5.2:
  repalce match to get