Merge branch 'v1.3-dev'