Merge "Stop skipping 2 methods in config changes"