Merged Rift into Composition to avoid an orphan instance