Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for...