Merge "Add team rules under build/make" into main