Merge "Improve downloadchange method"