Patches pushed as 81c1d127aeb16d6ee0eece6d6ed6b194019b2ea6 and
following.
Thanks.