Merge "Fix -Wformat warning" into main