Merge "Fix build timeout & upgrade sphinx"