case 2857 - Corrected node access logic.
Merge remote-tracking branch 'origin/case-2857' into develop