BZ-MERGE from EBP branch