PFC-2360 #resolve done