Merge "Don't log error on success" into main