Merge "Add class for plans in compatibility testing" into nyc-mr1-dev