(cherry picked from commit 7202a02c0a5238682de6a3a06a9b5137f02ad70c) (cherry picked from commit 5e60fd64)