PFC-2319 #resolve done