CORE-1509 Memory improvements for large sqlFile files:Additional memory improvements