8.0 tea fixes

Merged Sebastian Kennedy requested to merge 8.0-tea-fixes into 8.0-tea-reimputation

Merge request reports