Looking at this URL, it seems it still needs to be merged with the OpaqueKeys changes?