DE20056 - RPB: Fixed drag and drop