fix for EUCA-8957
fixes EUCA-9298
Merge branch 'team/network/edge' into testing