CORE-4660: Corrected
CORE-4661: Corrected