Merge "Fix -Wformat compiler warning" into main