Merge "Fix Wthread-safety-reference-return warnings" into main