Merge branch 'ts/doctar'