Merge "docs: gms fixes" into jb-mr1-dev