HPCC-12662 Changes following review