Patches applied as 4bceee3ed0660706cab2d2928610ef425d120cbc and
following.
Thanks.