Better rendering of constants and node mapping paths
No more restart.  Have to do without it.
Merge conflicts
Merge conflicts
Cherry picking and conflict resolution from master.