Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint