[dbal] merge from repo head, resolve tons of conflicts