Merge branch 'la/doc-choose-starting-point-fixup'