Merge "Retry compiling a previously failing package after update" into nyc-dev