SONAR-3893 Further memory usage optimization