DATAGRAPH-481 - After release cleanups.