Inheritance still works on unexisting node on checking.
Fixed merge cherry pick merge errors