Merge "Use uint64_t instead of size_t when calculating extent size to avoid overflow" into main