Merge branch jb-mr1 to legacy