Update of 3.4 branch to rc2
Merge pull request #681 from dbabokin/34_rc2

Update of 3.4 branch to rc2