Finish release-0.9.6