Merge "Fix test" into jb-dev