Those changes are to be backported to the upstream actually, for until then it should be good enough to have it locally.
Currently covers only small set of functionality.