Merge pull request #23662 from rohitwaghchaure/backport-subcontracting-issues

fix: multiple subcontracting issues