Harmonize with master