Update dev-3.x with release-3.13.0