Resolve #3200311 "Performance issues due"

pingevtrequested to merge
issue/crop-3200311:3200311-performance-issues-due into 8.x-2.x

Closes #3200311

Merge request reports