PFC-2457 #resolve