Merge with upstream - jb-3.0