merge 3.2: issue 14629