Merge branch 'MDL-47494-ddwtos' into MDL-47494