Given that this still hasn't been picked up in any other tree would people mind if we push patches 1 and 2 through the XFS tree? I some more changes that sit ontop of this, and it would make my life a lot easier.