Merge "Move regression classes to contrib"