CELDL - 221
Merge remote-tracking branch 'origin/deploy-v0.9' into deploy-v0.9