Add required fields in so

Merged Agustin Bordon requested to merge T5697 into 17.0-stage

Merge request reports