The commit is a cherry-pick from Fedora Rawhide 79d75fdcddac78d2c73000a6ae7569eabb05f7bc . The commit is a cherry-pick from Fedora Rawhide f8ef5964d0f872f70fa1f5b997de49bec02755d8 . The purpose is to fix Build failures. Related: rhbz#2210326