Merge branch '1811-very-poor-performance-creating-merge-request-regression-in-9-0-often-hits-60-seconds-timeout-on-small-requests' into 'master'

Resolve "Very poor performance creating merge request, regression in 9.0 - often hits 60 seconds timeout on small requests"

Closes #1811

See merge request !1522