Merge pull request #4880 from huanghongbo-hhb/feat/release-plan-save-conflict-check-v1