Merge "Remove default=None for configuration bindings"