Merge branch 't/versioning_improvements'