fix project code
Merge branch 'minzu_dev_beta' into minzu