fixup! Make Studio support opaque-keys
fixup! Make Studio support opaque-keys