Merge "nosdn fdio scenario fixes"