CORE-12792

CORE-12792