Reinstate changes from !112229
!112229 (merged) was reverted in !112619 (merged) because it caused a statement timeout in production.
The changes should be reinstated after fixing the statement timeout issue.
!112229 (merged) was reverted in !112619 (merged) because it caused a statement timeout in production.
The changes should be reinstated after fixing the statement timeout issue.