Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1