[ARIES-885] Backport to jpa20