Fix conflicts after merging MH-560 to dev