Fixes #1915
Present short summary (50 characters or less)
We have already implemented these changes in production. Opening this PR, such that our code base reflects the changes that we already made in production.
Coverage remained the same at 95.872% when pulling 17e484c3a2640ee56c849aae422b4722b88a6ef1 on maintenance/#1915-collection-boost into c5ae044fa12b2810988fc868faecffa1ce2c4f23 on develop.
Fixes #1915 Present short summary (50 characters or less)
We have already implemented these changes in production. Opening this PR, such that our code base reflects the changes that we already made in production.