PR #7040

PR #7040 is not in the merge queue.