Merge all the latest trunk enhancements into the autosetup branch.

FossilOrigin-Name: d0554ac46866b5ad467b88de6fae06695fd81e7fdf38157702a395f7282cbe9d