Fix conflicts after merging MH-634 to dev