Change Details

This is a refactor only, no functional change. Partial backport of core PR11824 (commit 66aa1d5) Depends on D2605

This is a refactor only, no functional change. Partial backport of core PR11824 (commit 66aa1d5) Depends on D2605 and D2620

This is a refactor only, no functional change. Partial backport of core PR11824 (commit 66aa1d5) Depends on D2605 and D2620