PFC-2432 #resolve