Fix for PLAT-842