Merge branch 'release/1.3.4'
Merge branch 'release/1.3.5'