Server-side: DAO fix
Merge remote-tracking branch 'origin/dev-gpath' into dev-gpath