Updates to support investigation of DATAGRAPH-461