Fix references to Grizzly
Merge branch 'multi-node', remote-tracking branch 'origin'