DAO properties update
Merge remote-tracking branch 'origin/backend' into backend