Patches applied as 9b03e84e4efb2ef58b6f91fd550acf6914646bac and
following.
Thanks.