XX-11154 - Refactor DefaultContextConfiguration class