merge dxue branch