Issue #13540: Merge changes from 3.4