Merge the latest trunk changes into tree-explain branch. FossilOrigin-Name: 1a360da0f8314f232c224c71829646bc7558892b