fix to EUCA-8932
Merge branch 'testing' into team/network/edge