Editor DDROP
Merge origin/master