DATAGRAPH-467 - After release cleanups.