Merge branch 'bb/doc-eol-dirty'