[PLAT-3015] Fix merge compilation errors