BZ-8809: Changes in download gated behavior