Support NUCCORE-1112 refactoring