Merge commit '12890d0f61fc' into arch-mips