prepare backport of category report download change.