[PLAT-6723] Chnaged for PR