Fix conflicts after merging MH-592 to dev