Merge "Fix variable reference errors related to check groups." into lmp-mr1-ub-dev