Merge tag '0.8.5.2' into develop

Replace match to get

* tag '0.8.5.2':
add some text to 404
Merge branch 'release/0.8.5.3'

* release/0.8.5.3:
  add some text to 404