(cherry picked from commit 77b033c8bf8c0a76ff0d7065e2192cbe55d3a3b6)
(cherry picked from commit c0a0e5b52240ed415d3b43ba77659821887bf50b)