Fixing multiple contact assignment problem
Merge branch 'MH-859' into dev