Fix mtk shell and repo
Merge branch 'server'