PFC-2460 #resolve