Fix conflicts after merging MH-514 to dev