Pushed as 6e043dfccdf4c584b7308b618167838a2f4bb79d with some
modifications. Thanks.