[CR-17] Modify SO, PO, FC

Merged Luciano Ortiz requested to merge 15.0-fixes into 12.0-stage

Merge request reports