Merge "Avoid reading XML file when it doesn't exist." into sc-dev