Merge "Suppress fortify-source warning" into main