(cherry picked from commit dd3d297dab4fb2380889b4cec39aeba53f102896)
(cherry picked from commit cd7bab918448e914516b43536d346068bbdfe659)