Merge branch 'MH-560' into dev