Merge branch 'jc/triangle-push-fixup'