Merge "Fixed as per comments group and meter"