(cherry picked from commit 741b6cc5) (cherry picked from commit 8a39b8ea7ef4e65d3e014154fa4141a7cef2be85)