Fix the compatibility issue in merging
Fix the compatibility issue on misc