EAGLESIX-2698: further changes