fixes in get value
Merge branch 'master' into edge