Support NUCCORE-922