Merge Branch jb2