Fetch blocks

Please merge. These changes should be added after ff8a2c7112cf0981b1e7555ba9bca3bf8b8c3004.