Merge pull request #25878 from rohitwaghchaure/v13-sub-contract-enhancemnet

feat: subcontract code refactor and enhancement