Merge "mips msa configuration fix"