issue13666 - merge from 3.2