Merge forked changes from gianbao