Refactor code in BundleHelper
Merge pull request #1178 from yDelouis/refactorBundleHelper

Refactor code in BundleHelper
Fix compilation error on protected inner classes
Merge pull request #1179 from yDelouis/1177_fixProtectedInnerClass

Fix compilation error on protected inner classes