This commit was cherry-picked from Fedora rawhide <1f35109c5e?branch=rawhide>. Resolves: RHEL-5590
1f35109c5e