avoid bzip2 for dep
Merge branch 'core' into enterprise