Merge from 3.3: Issue #17390