Skip to content

Cherry-pick 1736 and 1740 to develop #1814

Cherry-pick 1736 and 1740 to develop

Cherry-pick 1736 and 1740 to develop #1814