Merge "Drag drop some changes" into rvc-dev