Issue #8169 by tj, added node_limit