Mirror changes from mono/runtime (#17803)