Put the changes to tracking default cuts and PV, back in.

This reverts merge request !30166 (merged)

This is reverting a revert, so re-introducing !30116 (merged)