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