Merge "Disable network after consecutive failures" into sc-dev