DATAGRAPH-476 - After release cleanups.