V0.9 release branch

Pull request for the V0.9 of the release branch.