Backport github download fixes for 3.0.0.4