Pull error-inject into release branch