EAGLESIX-2983 partial port