Merge "Use makeGlobalKey() directly instead of wfGlobalCacheKey()"