Set TraverseMode correctly in P+R edges
Merge branch 'mmri-rt' into mmri