Merge "Move the dist rules from monolithic to merged rules"