Merge "Add `makeKey` and `makeGlobalKey` to BagOStuff"