Merge branch 'MH-772' into dev