Bug 6099 - ControllerContext#addKeyValue ignores key type when key is derived