Merge branch 'ts/doctar' into next