version update
Merge branch 'release/1.3.0' into develop