EAGLESIX-2715: removed unrelated changes