[ issue-1221 ] Backporting fix to maint-2.4.0.