DATAREDIS-360 - After release cleanups.