Merge branch 'develop' into BUGFIX_setup_routing_resolution

16 jobs for BUGFIX_setup_routing_resolution in 23 minutes and 39 seconds (queued for 1 second)