Merge pull request #31380 from fracappa/fix/skip-updating-mcps-in-mcn-validation