Merge "Fix description of fields in the pipeline"