Rebase to latest release-0.9.1 (includes some small fixes)