ensure that options are passed to the init plugin
Merge remote-tracking branch 'origin/v0.6.0' into v0.6.0