Pushed as 7a34169f6c737d7e88b241fce6260c44ef464656 with some
modifications. Thanks.