Merge "Use separate XML for update config in system" into sc-dev