Merge pull request #41695 from MillerTechnologyPeru/feature/mips-trunk