Cherry-picking of the conslidated changes#20

ViktorHofer merged 1 commit intomasterdotnet/runtime:masterfrom

ConsolidationChangesdotnet/runtime:ConsolidationChangesCopy head branch name to clipboard