Merge branch 'sg/setup-doc-update'