[#3424] Backporting a change to 2.3