cherry pick pull 76 for repeat downloads