PMO-2834: fixed dragn and drop error.
Merge remote-tracking branch 'origin/master'