get multi-node looking in the right place for the umbrella
Merge bug25002