Issue #24002:backport fix for 24002, 24003, 23992 to 4_4_x branch