merge package refresh fix from company-dev branch