DATAGRAPH-526 - Adapt to API changes for SPRINGDATACMNS-DATACMNS-781