CORE-4968
CORE-4968