Merge "Retry pulling and tagging image"