*Synced from* [DIM-887](https://linear.app/dimensional/issue/DIM-887) *by mustafa*
Synced from DIM-887 by mustafa