EAGLESIX-2699 preparing for a merge