Merge branch 'dev'
Simplify 64361d8
v1.3.2
Merge branch 'dev'