PFC-2429 #resolve