[PLAT-4095] Fix for original use by OG-Language