fixes EUCA-8167 and coverity issue 10287
Merge branch 'testing' into team/network/edge