Better temp files creation/deletion in tests
Added Bundles
Synced from master
Synced from master