Merge pull request #3749 from BrzVlad/fix-mips-fix