Fix conflicts after rebasing MH-631