Fix errors and adjust routes
Merge branch 'MH-905' into dev