Merge branch 'yd/doc-merge-annotated-tag'