Issue #5933: NodeGrid