Handle only queued flavors different for replacement

PLAT-1618 #time 30m