Merge branch 'v2.13' into stable