(merge 3.2) Issue #12400: remove unused import