Patches pushed as e9e5e69ce5eba69b784488797b02c089bb276c31 and following.
Thanks.