Patch pushed as 0c0a2831b0c114dc5645482dcfef7f69e8a8298f with a few
modifications. Thanks.