PFC-2443 #resolve