DATAJPA-571 - After release cleanups.