Fix Exception when highlighting the node. (See #11994)
Update header.
Merge pull request #2123 from jburel/rebased/develop/crash-search

Crash Search (rebased onto develop)