Merge from 3.3 for fix for issue #16730