Merge branch "KylinMod" into kylindevteam