Merge commit 'ht/doc-version'