Merge "BUG-2511 Fix XXE vulnerability in initial config loaders"