supports packaging steal
bundling works
Merge branch 'master' into dist-dir

Fixes merge conflicts and tests