Merge "Doc update: restore missing GCM updates" into klp-docs