https://track.hpccsystems.com/browse/HPCC-9827