Sync dex-demo with development #67

Closed itamarcps closed 1 year ago