Merge branch 'release-3.13.0' into dev-3.x

Conflicts:
	package.json
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x

Conflicts:
	package.json
Update package.json with pre