Merge branch 'v1.3-dev' as v1.3.11