Cherry-pick dbserver fix to resolve merge conflict.