1.4.24-6
[CP Staging] Revert "Merge pull request #32422 from tienifr/fix/31503" (cherry picked from commit ee96c56d30dc404e3a1c69e9fc552024f36ceee7)
[CP Staging] Revert "Merge pull request #32422 from tienifr/fix/31503" (cherry picked from commit ee96c56d30dc404e3a1c69e9fc552024f36ceee7)