Fix bug when starting the Bootstrapper
Update changelog
Bump version
Merge branch 'release/0.9.6' into develop