Merge branch 'MH-575' into dev