* Add a comment to the template section that the shape features are
  extracted and cached during the first run of the pipeline.
* Use "shape feature" instead of only "feature" whenever it is not
  completely clear that we mean the first.