Issue #22854: Merge UnsupportedOperation fixes from 3.5