better fix
Merge remote-tracking branch 'origin/FixNullIssueWithDependencyNode' into YsVersion