Merge jb branch into jb-test