danzi: merge dsa-postgres2-danzi and dsa-postgres2-danzi6