- Merge remote-tracking branch 'remotes/origin/main' into basop-2314-remove-duplicated-code-in-core-switching
