Update of 3.4 branch to rc2