Merge "remove default=None for config options"