Merge "Get Node API fix"