Merge branch 'rr/triangle'