Issue #19296 Add default if X.options is not set.