Fix "k --version" continues executing
Merge branch 'release' into dev