Merge branch 'jb-mr1' into kylin