Sync with fedoraproject g2 changes.