Merge branch "jb-mr1" file into kylin