Merge branch 'sb/doc-unify-bottom'