We need to pick c8519003a34dc7db44854a3d844d1c7432d52a78 into 4.1 too.
Isn't this the same as with gladiac's RH patches that we finally did not put into releases?