Update to latest release-0.9.5 code