Merge branch 'release/1.3'
Merge remote-tracking branch 'origin/develop'