PFC-2427 #resolve fixed