fix merge MDH-15