Merge "Doc update: misc GCM fixes" into klp-docs