(cherry picked from commit 1cb7dad7b4c456244dd50c9deecaa9c2bc989c1c) (cherry picked from commit 4a20592a277b30281a2a1dda4bcba140e59bba1f)