7.0-fix_adv_reconcile

Merged Sebastian Kennedy requested to merge 7.0-stage into 7.0

Merge request reports