Backfill subpackage
Fix BRIDGE-278
Merge pull request #343 from eric-wu/develop

Fix Travis test failures