don't set --path - will be handled by the setup
Merge branch 'release/0.9.4'