Merge up with jb-mr2