merged with mips_v2 branch