EAGLESIX-2713: further changes
EAGLESIX-2713: All test cases pass