[MERGE] with addons-trunk and resolve conflict in base_iban