Change Details

Alternative approach to D11973 Depends on D12607

This is needed for the backport of core#20744 Depends on D12607

Alternative approach to D11973This is needed for the backport of core#20744 Depends on D12607