EAGLESIX-1695 in preparation for another merge with expressions