Merge latest trunk changes with fts3-changes branch. FossilOrigin-Name: 226686475c28cdc87e86d2d3f10014436a9a2b8f