Merge "Adding nulls check in various drop-drop events" into ub-now-master