Merge branch 'jk/version-string'