Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs