merge from 3.2. Issue  #13073 - Address the review comments made by Ezio.