Merge "Check canonical path when download requested."