Updated version
PLAT-2191