[NUCMONGODB-140] Support NUCCORE-1112 refactoring