9.0.31-4
[CP Staging] Fix/48801 (cherry picked from commit 69cb7bb2ed4302903b8f9367be8002cae1874cf3) (CP triggered by luacmartins)
[CP Staging] Fix/48801 (cherry picked from commit 69cb7bb2ed4302903b8f9367be8002cae1874cf3) (CP triggered by luacmartins)