Fix for PLAT-1238