Handle doSegmentPhiMatching correctly

More old/new configuration fixes

Follow up from !39908 (closed)

Merge request reports

Loading