Merge pull request #262 from 317brian/rebuild-28.0.1-prod