Issue #17376: Merged clarification from 3.2.