Catch up to master
release 3.5.0