Additional changes for yarn memory overhead issue