Merge pull request #37686 from s-aga-r/FIX-37423

feat: allow return of components for SCO that don't have SCR created