Merge from ReForm

Merged Max Lyon requested to merge merge-from-ReForm into master

Merge request reports