lzhecheng: [release-1.0] Cherrypick 1826 1827 1844 1608 1861

No Results