harmonize with some D2 changes