PFC-2410 #resolve