CORE-11485

CORE-11485