Merge branch 'MH-576' into dev