Merge pull request #17628 from colemanw/customOptionsFallback