DATAJPA-622 initial commit