Merge "Fix an issue when nodes are not available in standalone test"