*8212* Review components/keys to shared