DATAGRAPH-512 - After release cleanups.