Merge "docs: fix g+ gms description" into jb-dev