Merge updates from trunk.

FossilOrigin-Name: bf90f1fbf84a288e787a563a3952d30622b26ef9