Merge "nosdn-fdio scenario fix"