Merge branch 'ab/gc-doc-update'