Merge "Fixed Group and meter id bugs"