Patch applied as 5147787b1fae6b06bd6c1e3ebc66ea4328420746 with some
modifications.
Thanks.