[PLAT-2959] - Fix merge issue