[#3424] Backporting a change to 2.3
Merge branch '2.3' into 2.4