Update to version 3.5 in master branch