Merge pull request #17219 from colemanw/api4deprecateOptions