Merge branch 'master' into dm-working
removed conflict file
Merge branch 'dm-working'