diff --git a/contrib/gana b/contrib/gana
index 1ec4596bf..214bc6644 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 1ec4596bf4925ee24fc06d3e74d2a553b8239870
+Subproject commit 214bc664476333a2c042ae57911558d1325e725f
diff --git a/debian/etc-libtalerexchange/taler/taler.conf b/debian/etc-libtalerexchange/taler/taler.conf
index 71663be5e..1c86ccc36 100644
--- a/debian/etc-libtalerexchange/taler/taler.conf
+++ b/debian/etc-libtalerexchange/taler/taler.conf
@@ -30,6 +30,8 @@
 # systems is always rounded to this unit.
 #currency_round_unit = KUDOS:0.01
 
+# Monthly amount that mandatorily triggers an AML check
+#AML_THRESHOLD = KUDOS:10000000
 
 [paths]
 
diff --git a/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf b/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
index 554852a14..7547e8264 100644
--- a/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
+++ b/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
@@ -24,8 +24,8 @@ BASE_URL =
 # Bank accounts used by the exchange should be specified here:
 [exchange-account-1]
 
-enable_credit = yes
-enable_debit = yes
+enable_credit = no
+enable_debit = no
 
 # Account identifier in the form of an RFC-8905 payto:// URI.
 # For SEPA, looks like payto://sepa/$IBAN?receiver-name=$NAME
@@ -34,4 +34,4 @@ payto_uri =
 
 # Credentials to access the account are in a separate
 # config file with restricted permissions.
-@inline-secret@ exchange-accountcredentials-1 ../secrets/exchange-accountcredentials.secret.conf
+@inline-secret@ exchange-accountcredentials-1 ../secrets/exchange-accountcredentials-1.secret.conf
diff --git a/debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials.secret.conf b/debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials-1.secret.conf
similarity index 100%
rename from debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials.secret.conf
rename to debian/etc-taler-exchange/taler/secrets/exchange-accountcredentials-1.secret.conf
diff --git a/src/exchangedb/exchange_do_batch2_reserves_in_insert.sql b/src/exchangedb/exchange_do_batch2_reserves_in_insert.sql
index af9ea3195..6df8b7554 100644
--- a/src/exchangedb/exchange_do_batch2_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_batch2_reserves_in_insert.sql
@@ -13,6 +13,8 @@
 -- You should have received a copy of the GNU General Public License along with
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
+
+DROP FUNCTION IF EXISTS exchange_do_batch2_reserves_insert;
 CREATE OR REPLACE FUNCTION exchange_do_batch2_reserves_insert(
   IN in_reserve_pub BYTEA,
   IN in_expiration_date INT8,
diff --git a/src/exchangedb/exchange_do_batch4_reserves_in_insert.sql b/src/exchangedb/exchange_do_batch4_reserves_in_insert.sql
index 0d35e1214..6a5707109 100644
--- a/src/exchangedb/exchange_do_batch4_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_batch4_reserves_in_insert.sql
@@ -13,6 +13,8 @@
 -- You should have received a copy of the GNU General Public License along with
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
+
+DROP FUNCTION IF EXISTS exchange_do_batch4_reserves_insert;
 CREATE OR REPLACE FUNCTION exchange_do_batch4_reserves_insert(
   IN in_reserve_pub BYTEA,
   IN in_expiration_date INT8,
diff --git a/src/exchangedb/exchange_do_batch8_reserves_in_insert.sql b/src/exchangedb/exchange_do_batch8_reserves_in_insert.sql
index 8fa5ff5d5..a9f34b897 100644
--- a/src/exchangedb/exchange_do_batch8_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_batch8_reserves_in_insert.sql
@@ -13,6 +13,8 @@
 -- You should have received a copy of the GNU General Public License along with
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
+
+DROP FUNCTION IF EXISTS exchange_do_batch8_reserves_insert;
 CREATE OR REPLACE FUNCTION exchange_do_batch8_reserves_insert(
   IN in_reserve_pub BYTEA,
   IN in_expiration_date INT8,
diff --git a/src/exchangedb/exchange_do_batch_reserves_in_insert.sql b/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
index 4eec2e006..5ee819229 100644
--- a/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_batch_reserves_in_insert.sql
@@ -14,6 +14,7 @@
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
 
+DROP FUNCTION IF EXISTS exchange_do_batch_reserves_in_insert;
 CREATE OR REPLACE FUNCTION exchange_do_batch_reserves_in_insert(
   IN in_reserve_pub BYTEA,
   IN in_expiration_date INT8,