Merge "Changing related settings file"