(cherry picked from Fedora commit 1f64e4dcdb5d11d015fddf200e30dc8f63c2a59c)
(cherry picked from Fedora commit d849d8f12715320b2e1713e414d665f1a8347a9d)