Fix another issue - should use _options.
Merge branch 'master' into ckdev