PFC-2574 #resolve done