8.0 fix helpers

Merged Sebastian Kennedy requested to merge 8.0-fix_helpers into 8.0-stage

Merge request reports