Fix syntax errors
Merge branch 'MH-859' into dev