Merge branch 'release/v1'
Merge branch 'hotfix/kk' into develop