Improve bundling process.
Fix issues related to bundling.
Merge with master