Rebased onto dev (8.x-1.x) and removed a duplicative function after accidentally including it twice

Merge request reports

Loading