8.0 issue#1 surcharge

Merged Sebastian Kennedy requested to merge 8.0-issue#1-surcharge into 8.0-stage

Closes #1 (closed)

Merge request reports