am 648de548: Merge "docs: gms fixes" into jb-mr1-dev

* commit '648de5483b20bd80bda267a4430daca2ae0b089a':
  docs: gms fixes