Fix conflicts after rebase MH-538