Merge branch 'router-cleanup' into 'develop'