use extract_options!
Merge pull request #11252 from neerajdotname/use-extract-options

use extract_options!