Merge branch 'release/v1.3.2' into develop