Issue #3568465 Massive performance improvement

Alex Pottrequested to merge
issue/diff-3568465:3568465-massive-performance-improvement into 8.x-1.x

Closes #3568465

Edited by Alex Pott

Merge request reports