[NUCLDAP-61] Support NUCCORE-1112 refactoring