Merge "Fix test" into jb-mr2-dev