Merge branch 'main' into 382-investigate-huge-difference-in-resource-usage-network