Merge pull request #23728 from marination/prod-plan-status

feat: Close Production Plan