Merge xy/jb-mr1