Merge branch 'release/3.4.0'
Merge branch 'release/3.5.0'
Merge branch 'release/3.6.0'
Fix unit tests