Fix conflicts after merging MH-1032 to dev