ENG-5459 fix and fix issues with scripts not able to pass space delim and heap override not
applied.