Issue 24745: Merge with 3.4