MODE-2281 Corrected behavior when system-related node types are used outside of system area.
Merge pull request #1221 from rhauch/mode-2281

MODE-2281 Corrected behavior when system-related node types are used outside of system area