DATAJPA-347 - Prepare nexte development iteration.