EAGLESIX-2687 updated port of Value