PFC-2554 #resolved fixed