More fixes
Merge branch 'MH-1008' into dev