[PLAT-6591] Updated as per code review