Added #564642 to support node view on recursive node rebuilding