Merge commit 'remotes/ctb/doc_alignment' into tutorial