ENG-6260 patch non-debug build errors