CE->EE merge

Supersedes !801 (closed).

Merge request reports

Loading