**Before**  **After**  (cherry picked from commit 0262c66ba6c1d7488456269b2e56220bf6cf0b6f)