Merged trunk changes 915-929 into the new-backend branch.
Merged trunk changes 730-765 into the new-backend branch.
