HPCC-11025 - changes after review