Merge "Keep dynamic network creation backward compatible."