Last changes before the 3.4 release