Adding latest changes of master to the build branch for 3.4