Revert "Revert "Merge branch 'ph/fixSlashAndHashVueRouter' into 'master'""

This reverts commit 91027b6a41a65b964cd285680c65ae7ec4f3fb0d.

Basically, reverting the revert. We kept the revert in
to make history align between master and release branches.