Added changes form the 2-0 branch

Change-Id: Idc6cd784db649c1ee0758cdf501b7cd938af69d8
Several fixes for copies via drag & drop

Change-Id: I06dfdcaee086ed37c8b09c5db336fad6738d36ad