Merge commit 'ht/doc'