Issue #13478: merge with 3.2