DATAGRAPH-529 - After release cleanups.