Backport #4293 to 2.3 branch