Merge "Account for different charging policies." into main