Issue #15116: merge from 3.3