Mirror changes from mono/coreclr (#17297)