This should be fixed in master, and require backporting of 5 patches. Since this is only nice to have fix, we are not going do this in 3.5. For details see https://bugzilla.redhat.com/show_bug.cgi?id=1195768#c4