Merge "Fix the mono test" into jb-mr2-dev