Merge remote-tracking branch 'remotes/origin/main' into basop-2280-back-and-forth-scaling-in-core-coder
