Merge branch 'release/v1.3.0' into develop