Elopment Package Updates

Per Rebecca Pang
Merge branch 'dev'