[backfire] merge r25302 - this is needed for upcoming changes in the packages feed