Allow target configuration to override options.
Merge remote-tracking branch 'origin/override-options'