Issue #5933: NodeGrid

Issue #5933: NodeGrid