Fix formatting of contact handle
Fix conflicts after merging MH-538 to dev