Issue #17128: Merge / update from 3.4