Merge "Refactor XML config parsing" into sc-dev