Merge "Extract global configuration update"