Merge updates from trunk.

FossilOrigin-Name: f29680c468d5635e5ea7711f12f56ff467824241