Merge pull request #23688 from rohitwaghchaure/fixed-overproduction-issue-develop

fix: overproduction issue develop