Merge Dejiaentrance to main repo