Contour line improvement.
Merge remote-tracking branch 'origin/v7.1' into v7.1