Merge pull request #20311 from ValdikSS/miredo