(cherry picked from commit 67738db1) (cherry picked from commit a228d0a83db06fbe81b1c74fe3b1aea3133cee50)