Merge "Fix -Wfortify-source warning (2nd)" into main