Merge branch 'routing-fixed' into 'main'

routing issues seem to have gone away

See merge request !21
2 jobs for main in 1 minute and 40 seconds (queued for 14 seconds)