INT-2881: Add support for the firstRecord to retrieving JPA gateway
INT-2881: push review comments
INT-2881: push more review comments