Issue: #12409: merge with 3.2