PFC-2430 #resolve