Merge "Fix InvalidConfigRemoved"