SOC-3557 | Social Unit Testing is slowness with lack of heap memory
Merge commit '92cd73459e8c4dbc132b47cf2d7813e4a3859b88' into HEAD