Fix conflicts after merging MH-620 to dev