Issue #17007: Merged minor changes from 3.2.