391386 - Unifies the bundle location persistence and creation
3 files changed