Hmm ... the mentioned commits from https://bugzilla.redhat.com/show_bug.cgi?id=1201630 are already part of file-5.22-10.1