[#3697] Backporting 2.3-specific changes
Merge branch '2.3' into 2.4