[PLAT-5050,PLAT-5061] Better implementation of PLAT-5050 wrt PLAT-5061