Merge "Fixing folder creation for drops from other folders"