Fix for PLAT-840