Merge branch 'ext-provoking-vertex'