Merge branch 'MH-673' into dev