PFC-2425 #resolve