Issue #16096: port fix from 3.3