Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'