Merge "Handle 451 indirects during sync"