Issue #23607: Merged in changes from 4_5_x