Merge branch 'MH-638' into dev