Fixes #710
Reduce the impact of hidden dependencies on BundleConfiguration and Constants.shared Fixes #656