Merge branch '40-userouterstate-refactoring' into 'dev'

Resolve "Refactoring of the routerStateHandlers."

Closes #40

See merge request !28
2 jobs for 97-add-missing-props-validators
in 1 minute and 52 seconds and was queued for 1 second