Merged branch feature_drag with develop