Charging structure changes

Bjarke Madsenrequested to merge
charging-structure-changes into develop

Saket's charging structure changes made into a merge request, rather than direct commits on develop

Merge request reports