Issue #18383: Merge warnings fix from 3.5