Make leave veto route changes so they don't call the enter callbacks.
Merge remote-tracking branch 'upstream/experimental_hierarchical' into peh
Minor fix.