Fix merging MP1-4100.