(cherry picked from commit 513dcf6817dd76fde8096ff04cd888d7c908461d) (cherry picked from commit 022bf783aa89c1c81374ebef5dba2df95b7563b5)