Merge with 3.3 for issue #16262