VEDA specific changes to create internal release