Merge "Fix ConfigBundle not being set in quick deploy"