Update version
Merge branch 'master' into feature-tcc-api-log