Merge remote-tracking branch 'remotes/origin/main' into 1161-unused-heap-in-omasa