diff --git a/db_scripts/diff/15573.down b/db_scripts/diff/15573.down
new file mode 100644
index 00000000..0f3814e4
--- /dev/null
+++ b/db_scripts/diff/15573.down
@@ -0,0 +1,64 @@
+use billing;
+
+drop trigger if exists billing.bill_fees_crepl_trig;
+drop trigger if exists billing.bill_fees_urepl_trig;
+
+update billing_fees_raw set onpeak_use_free_time = if(onpeak_use_free_time,1,if(offpeak_use_free_time,1,0));
+alter table billing_fees_raw drop column offpeak_use_free_time;
+
+update billing_fees_history set onpeak_use_free_time = if(onpeak_use_free_time,1,if(offpeak_use_free_time,1,0));
+alter table billing_fees_history drop column offpeak_use_free_time;
+
+update billing_fees set onpeak_use_free_time = if(onpeak_use_free_time,1,if(offpeak_use_free_time,1,0));
+alter table billing_fees drop column offpeak_use_free_time;
+
+alter table billing_fees_raw change onpeak_use_free_time use_free_time tinyint(1) not null default 0;
+alter table billing_fees_history change onpeak_use_free_time use_free_time tinyint(1) not null default 0;
+alter table billing_fees change onpeak_use_free_time use_free_time tinyint(1) not null default 0;
+
+delimiter ;;
+
+create trigger billing.bill_fees_crepl_trig after insert on billing_fees
+  for each row
+  begin
+  declare my_bzh_id int unsigned;
+
+  select id into my_bzh_id from billing.billing_zones_history where bz_id = NEW.billing_zone_id;
+
+  insert into billing.billing_fees_history
+    values(NULL, NEW.id, NEW.billing_profile_id, my_bzh_id,
+     NEW.source, NEW.destination, NEW.direction,
+     NEW.type, NEW.onpeak_init_rate, NEW.onpeak_init_interval, NEW.onpeak_follow_rate,
+     NEW.onpeak_follow_interval, NEW.offpeak_init_rate, NEW.offpeak_init_interval,
+     NEW.offpeak_follow_rate, NEW.offpeak_follow_interval, NEW.use_free_time, NEW.match_mode,
+     NEW.onpeak_extra_rate, NEW.onpeak_extra_second, NEW.offpeak_extra_rate, NEW.offpeak_extra_second);
+
+  end;
+;;
+
+create trigger billing.bill_fees_urepl_trig after update on billing_fees
+  for each row
+  begin
+  declare my_bzh_id int unsigned;
+
+  select id into my_bzh_id from billing.billing_zones_history where bz_id = NEW.billing_zone_id;
+
+  update billing.billing_fees_history
+    set bf_id = NEW.id, billing_profile_id = NEW.billing_profile_id,
+      billing_zones_history_id = my_bzh_id,
+      source = NEW.source, destination = NEW.destination, direction = NEW.direction,
+      type = NEW.type,
+      onpeak_init_rate = NEW.onpeak_init_rate, onpeak_init_interval = NEW.onpeak_init_interval,
+      onpeak_follow_rate = NEW.onpeak_follow_rate, onpeak_follow_interval = NEW.onpeak_follow_interval,
+      offpeak_init_rate = NEW.offpeak_init_rate, offpeak_init_interval = NEW.offpeak_init_interval,
+      offpeak_follow_rate = NEW.offpeak_follow_rate, offpeak_follow_interval = NEW.offpeak_follow_interval,
+      use_free_time = NEW.use_free_time, match_mode = NEW.match_mode,
+      onpeak_extra_rate = NEW.onpeak_extra_rate, onpeak_extra_second = NEW.onpeak_extra_second,
+      offpeak_extra_rate = NEW.offpeak_extra_rate, offpeak_extra_second = NEW.offpeak_extra_second
+    where bf_id = OLD.id;
+
+  end;
+;;
+
+delimiter ;
+
diff --git a/db_scripts/diff/15573.up b/db_scripts/diff/15573.up
new file mode 100644
index 00000000..e21c84db
--- /dev/null
+++ b/db_scripts/diff/15573.up
@@ -0,0 +1,67 @@
+use billing;
+
+drop trigger if exists billing.bill_fees_crepl_trig;
+drop trigger if exists billing.bill_fees_urepl_trig;
+
+alter table billing_fees_raw add column offpeak_use_free_time tinyint(1) not null default 0;
+update billing_fees_raw set offpeak_use_free_time = use_free_time;
+
+alter table billing_fees_history add column offpeak_use_free_time tinyint(1) not null default 0;
+update billing_fees_history set offpeak_use_free_time = use_free_time;
+
+alter table billing_fees add column offpeak_use_free_time tinyint(1) not null default 0;
+update billing_fees set offpeak_use_free_time = use_free_time;
+
+# this is for cosmetics only:
+alter table billing_fees_raw change use_free_time onpeak_use_free_time tinyint(1) not null default 0;
+alter table billing_fees_history change use_free_time onpeak_use_free_time tinyint(1) not null default 0;
+alter table billing_fees change use_free_time onpeak_use_free_time tinyint(1) not null default 0;
+
+delimiter ;;
+
+create trigger billing.bill_fees_crepl_trig after insert on billing_fees
+  for each row
+  begin
+  declare my_bzh_id int unsigned;
+
+  select id into my_bzh_id from billing.billing_zones_history where bz_id = NEW.billing_zone_id;
+
+  insert into billing.billing_fees_history
+    values(NULL, NEW.id, NEW.billing_profile_id, my_bzh_id,
+      NEW.source, NEW.destination, NEW.direction,
+      NEW.type, NEW.onpeak_init_rate, NEW.onpeak_init_interval, NEW.onpeak_follow_rate,
+      NEW.onpeak_follow_interval, NEW.offpeak_init_rate, NEW.offpeak_init_interval,
+      NEW.offpeak_follow_rate, NEW.offpeak_follow_interval, NEW.onpeak_use_free_time,
+      NEW.match_mode, NEW.onpeak_extra_rate, NEW.onpeak_extra_second, NEW.offpeak_extra_rate, NEW.offpeak_extra_second,
+      NEW.offpeak_use_free_time);
+
+  end;
+;;
+
+create trigger billing.bill_fees_urepl_trig after update on billing_fees
+  for each row
+  begin
+  declare my_bzh_id int unsigned;
+
+  select id into my_bzh_id from billing.billing_zones_history where bz_id = NEW.billing_zone_id;
+
+  update billing.billing_fees_history
+    set bf_id = NEW.id, billing_profile_id = NEW.billing_profile_id,
+      billing_zones_history_id = my_bzh_id,
+      source = NEW.source, destination = NEW.destination, direction = NEW.direction,
+      type = NEW.type,
+      onpeak_init_rate = NEW.onpeak_init_rate, onpeak_init_interval = NEW.onpeak_init_interval,
+      onpeak_follow_rate = NEW.onpeak_follow_rate, onpeak_follow_interval = NEW.onpeak_follow_interval,
+      offpeak_init_rate = NEW.offpeak_init_rate, offpeak_init_interval = NEW.offpeak_init_interval,
+      offpeak_follow_rate = NEW.offpeak_follow_rate, offpeak_follow_interval = NEW.offpeak_follow_interval,
+      onpeak_use_free_time = NEW.onpeak_use_free_time, offpeak_use_free_time = NEW.offpeak_use_free_time,
+      match_mode = NEW.match_mode,
+      onpeak_extra_rate = NEW.onpeak_extra_rate, onpeak_extra_second = NEW.onpeak_extra_second,
+      offpeak_extra_rate = NEW.offpeak_extra_rate, offpeak_extra_second = NEW.offpeak_extra_second
+    where bf_id = OLD.id;
+
+  end;
+;;
+
+delimiter ;
+