(cherry picked from commit 550f1197e818c35c7c05fd6184e69c7d29559e9f) (cherry picked from commit 000a4ffc3fd5578890edbca6a8cdd765c4b842df)