[ issue-1225 ] Back-ported fix to maint-2.4.0