xianrui merge master