Merge "Relief unnecessary dependencies of code order" into main