Merge branch 'feature/issue-383-remove-old-routing-classes' into develop