Make changes for releasing v2.3.5