PFC-2380 #resolve