Merge branches 'fetch-binary-cte' and 'network-unavailable-and-offline-are-different'