Merge pull request #24556 from anupamvs/s-c-changes