Patches pushed as 2fb2a4c086286f7cf444a4734520d58ad29bc182 and
following.
Thanks.