Backports (4511) from fts3. (CVS 5453) FossilOrigin-Name: d562515e1cdd05212674516033c64b5f5668b799
FossilOrigin-Name: 68677e420c744b39ea9d7399819e0f376748886d