PR #7365

PR #7365 is not in the merge queue.