Fix conflicts after merging MH-612 to dev