Merge "Fix scenarios not passing down specific network"