Added an additional way to register the Contour operator.
Merge remote-tracking branch 'origin/v7.1' into v7.1