Merge "Fix the bool coder test" into nextgenv2