[NUCCORE-1097] One more