Merge branch 'release/1.3.0'